Merge from emacs-23; up to r100560.
authorGlenn Morris <rgm@gnu.org>
Sat, 23 Apr 2011 03:07:16 +0000 (20:07 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 23 Apr 2011 03:07:16 +0000 (20:07 -0700)
commit0389cfff3a8fc78c323631dbb1863f83f497412b
treec5dbc4c623f94a9cb97829e35915a2a67cbf1e7c
parent3a69951a2b4884a4b83ded4643fb366c423b06b1
parentb550f2f1128e47f906d29b3fbc3be349fee09f51
Merge from emacs-23; up to r100560.
29 files changed:
doc/emacs/ChangeLog
doc/emacs/mini.texi
doc/emacs/screen.texi
doc/lispref/ChangeLog
doc/lispref/frames.texi
doc/lispref/windows.texi
lisp/ChangeLog
lisp/ChangeLog.14
lisp/buff-menu.el
lisp/cedet/ChangeLog
lisp/cedet/ede/pconf.el
lisp/cedet/ede/proj-comp.el
lisp/cedet/ede/proj-elisp.el
lisp/cedet/ede/proj-scheme.el
lisp/image-mode.el
lisp/minibuffer.el
lisp/mouse-drag.el
lisp/mouse.el
lisp/play/doctor.el
lisp/play/mpuz.el
lisp/textmodes/page.el
src/ChangeLog
src/buffer.c
src/dispextern.h
src/msdos.c
src/s/ms-w32.h
src/sysdep.c
src/w32.c
src/xdisp.c